* nsmenu.m (ns_update_menubar): Exchange place of argument 2 and 3 to

memcpy.

diff --git a/src/ChangeLog b/src/ChangeLog
index 596b2b33dc667529dd30b889e3c82446b957b183..70cdfe0c6aa4f9699e33f083c9fc2b2bd56b139e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsmenu.m (ns_update_menubar): Exchange place of argument 2 and 3 to
+       memcpy (Bug#11907).
+
 2012-07-13  Kalle Kankare <kalle.kankare@iki.fi> (tiny change)
 
        * image.c (Fimagemagick_types): Initialize ex with GetExceptionInfo

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 2cd626e131a14108c504fe50f709ea54201563d8..f3bd9dd3ecb78e55e289ce93f50431aacc8f04d8 100644 (file)
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -448,8 +448,8 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu)
            break;
 
           if (n < 100)
-           memcpy (previous_strings[i/4], min (10, SBYTES (string) + 1),
-                   SDATA (string));
+           memcpy (previous_strings[i/4], SDATA (string),
+                    min (10, SBYTES (string) + 1));
 
          wv = xmalloc_widget_value ();
          wv->name = SSDATA (string);